56aff2ed27a5eaf4d9aabfd9414636ffa14b697d,clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterState.java,ClusterState,handleOrphan,#ClusterAddressInfo#,104

Before Change


    orphanCount = orphans.putIfAbsent( address.getAddress( ), orphanCount );
    orphanCount = ( orphanCount == null ) ? 1 : orphanCount;
    orphans.put( address.getAddress( ), orphanCount + 1 );
    LOG.warn( "Found orphaned public ip address: " + address + " count=" + orphanCount );
    if ( orphanCount > 10 ) {
      new UnassignAddressCallback( address ).dispatch( this.clusterName );
      orphans.remove( address.getAddress( ) );

After Change


  public void handleOrphan( ClusterAddressInfo address ) {
    Integer orphanCount = 1;
    orphanCount = orphans.putIfAbsent( address, orphanCount );
    LOG.warn( "Found orphaned public ip address: " + LogUtil.dumpObject( address ) + " count=" + orphanCount );
    orphanCount = ( orphanCount == null ) ? 1 : orphanCount;
    orphans.put( address, orphanCount + 1 );
    LOG.warn( "Updated orphaned public ip address: " + LogUtil.dumpObject( address ) + " count=" + orphanCount );
    if ( orphanCount > 10 ) {
      LOG.warn( "Unassigning orphaned public ip address: " + LogUtil.dumpObject( address ) + " count=" + orphanCount );
      new UnassignAddressCallback( address ).dispatch( this.clusterName );